]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
authPrompt: don't muck with cancelButton in onAskQuestion
authorRay Strode <rstrode@redhat.com>
Sun, 28 Jul 2013 20:15:43 +0000 (16:15 -0400)
committerRay Strode <rstrode@redhat.com>
Thu, 8 Aug 2013 14:55:34 +0000 (10:55 -0400)
onAskQuestion has this code:

    if (this.verifyingUser)
        this.cancelButton.show();
    else
        this.cancelButton.hide();

but onAskQuestion can only be called when this.verifyingUser is true.
Also, cancelButton is public, and it only ever otherwise gets hidden
from callers.

This commit drops mucking with cancelButton visibility, leaving it
entirely up to the callers to deal with.

https://bugzilla.gnome.org/show_bug.cgi?id=683437

js/gdm/authPrompt.js

index 07a92b7717c2974d701d5a9434dc3ecd9a2bac1a..b84e949ebdf8b9d22d2dcab8e74938506a3b8aad 100644 (file)
@@ -203,11 +203,6 @@ const AuthPrompt = new Lang.Class({
         this.setPasswordChar(passwordChar);
         this.setQuestion(question);
 
-        if (this.verifyingUser)
-            this.cancelButton.show();
-        else
-            this.cancelButton.hide();
-
         if (passwordChar) {
             if (this._userVerifier.reauthenticating)
                 this.nextButton.label = _("Unlock");